-
Notifications
You must be signed in to change notification settings - Fork 947
Conversation
I'm leaning towards we do a full merge, make "nerd-fonts" another supported font configuration, and just peg the version that we are compatible with. |
I just tried to respond by e-mail, but apparently that doesn't work. Anyway, I noticed you merged |
Sorry about that, I was merging using a new mergetool and it left all of the merge info (e.g., >>>>>HEAD) junk from git in there when I pushed. I fixed it and everything looks clean now. As far as I can tell, nothing in Let me know if there is anything else you'd like added/changed for this to land in |
dang. nevermind, I screwed up my merge worse than I thought. It is missing the latest commits you made yesterday and thinks that it already merged origin. Let me see if I can fix it with a rebase in my repo. |
* upstream/next: (41 commits) vcs icons: fixing branch spacing and remote icon in fontawesome same deal for the "FAIL_ICON"! fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken Change powerlevel9k_init to prompt_powerlevel_setup Fix MacOS specific battery segment logic. Minor fix-up to the README. Adding license note about the new logo. more typos Adding the new logo to the README! fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope fixed typo reverted testing value to default value added link to segemnt documenation in README fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty added README section for public_ip segment added the ability to specify and only attempt a particular method Add Changelog for v0.5.0 added configurable string when there is no IP updated some comments changed some offline behavior ...
Oops. I forgot to look into this PR. Sorry @kaymmm I am good to go with supporting nerd-fonts officially. But we should make clear in the README that we support the complete version only. That could confuse people. |
…nerdfont * 'next' of https://github.com/bhilburn/powerlevel9k: CHANGELOG: Updating to reflect work on `next` README: fixing name of `detect-virt` to `detect_virt` README: default segment list was no longer accurate updating changelog for segment name change `disk_usage` incorportaing feedback from review on `hdd_usage` segment Fix swift segment Updating the readme wih `hdd_usage` details. changing `hdd_usage` to actually show usage Moving `HDD_ICON` definition to consistent spot. Fix Fix Fix Fix Fix Fix Change colors Add anion155's HDD segment
This branch is now merged into |
This doesn't do anything regarding the bigger issues of #97, but it's a short-term fix for people using patched/complete nerd fonts. I added the 'nerd-patched-complete' method to the icons with updated codepoints that reflect the current state of the nerdfonts with relocated octoicons. Maybe until things settle down this can just remain open and people can pull it in as a patch. I haven't tested this extensively, but the few pre-patched nerd fonts whose codepoints I checked against seemed to line up correctly.